Factor out job cards into Composables for new data entry points #2892
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gino-m
changed the title
gino-m
requested changes
Dec 6, 2024
There was a problem hiding this comment.
Hey @sufyanAbbasi so cool to see this is working! A few suggestions/tweaks. Once we do those, I think we can submit as is without too much UI churn for now. @rawbzz Is still finalizing the latest designs, but what you have here takes us much closer.
ground/src/main/java/com/google/android/ground/ui/theme/Color.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt
Outdated
Show resolved
Hide resolved
...c/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
Outdated
Show resolved
Hide resolved
# Conflicts: # ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
sufyanAbbasi
changed the title
sufyanAbbasi
changed the title
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #2892 +/- ##
============================================
- Coverage 64.20% 62.99% -1.22%
- Complexity 1276 1289 +13
============================================
Files 272 273 +1
Lines 6532 6731 +199
Branches 909 935 +26
============================================
+ Hits 4194 4240 +46
- Misses 1737 1872 +135
- Partials 601 619 +18
|
gino-m
previously requested changes
Dec 19, 2024
...c/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
Outdated
Show resolved
Hide resolved
...c/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/MapUiData.kt
Outdated
Show resolved
Hide resolved
…ound-android into sufy/2446/new-loi-flow
Added "add_site" and two more strings (untranslated)
Added "add_site" and two more strings (untranslated)
Remaining translations added ("unnamed_job" and "job_site_icon").
Remaining translations added ("unnamed_job" and "job_site_icon").
Remaining translations added ("unnamed_job" and "job_site_icon").
Would you be able to add tests for modified lines? We can focus on the ones reported here by codecov if it helps. |
|
@sufyanAbbasi RFAL? |
|
Sorry I had to take a little time to merge in the ground --> app file change and added a test file to cover the core view model logic. I think we're good to go! |
|
Hi @shobhitagarwal1612! PTAL? |
shobhitagarwal1612
requested changes
Jan 28, 2025
...ain/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
Outdated
Show resolved
Hide resolved
.../main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
Show resolved
Hide resolved
app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/google/android/ground/ui/map/gms/GoogleMapsFragment.kt
Outdated
Show resolved
Hide resolved
# Conflicts: # app/src/main/res/values-pt/strings.xml
# Conflicts: # app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
shobhitagarwal1612
approved these changes
Feb 5, 2025
app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapComposables.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapComposables.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapComposables.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapComposables.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapComposables.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapComposables.kt
Show resolved
Hide resolved
...ain/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2446
Reimplements the entire add LOI/selection UX to match the new designs (see above issue).
add_dataandadd_site.@gino-m PTAL?